auto merge of #388 : alexcrichton/cargo/fix-cross-builds, r=burningtree
authorbors <bors@rust-lang.org>
Sun, 17 Aug 2014 05:19:23 +0000 (05:19 +0000)
committerbors <bors@rust-lang.org>
Sun, 17 Aug 2014 05:19:23 +0000 (05:19 +0000)
0c834d7b accidentally broke this by favoring rustc's target triple over the
actual target triple.


Trivial merge